Merge remote-tracking branch 'origin/master' into feature/android

diff --cc doc/lispref/display.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc lisp/minibuffer.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc lisp/wid-edit.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xterm.c
Simple merge